From de4688a591661b0b67defc6eeffd54d168086350 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 12 Oct 2007 14:14:13 -0600 Subject: [PATCH] [IA64] vmx_setup_platform() may fail. make it return error value. Signed-off-by: Isaku Yamahata --- xen/arch/ia64/vmx/vmx_init.c | 26 +++++++++++++++++++------- xen/arch/ia64/xen/dom0_ops.c | 2 +- xen/include/asm-ia64/vmx.h | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/xen/arch/ia64/vmx/vmx_init.c b/xen/arch/ia64/vmx/vmx_init.c index a35367adb8..f29f9cfe30 100644 --- a/xen/arch/ia64/vmx/vmx_init.c +++ b/xen/arch/ia64/vmx/vmx_init.c @@ -394,24 +394,34 @@ static void vmx_build_io_physmap_table(struct domain *d) } -void vmx_setup_platform(struct domain *d) +int vmx_setup_platform(struct domain *d) { + unsigned long mpa; ASSERT(d != dom0); /* only for non-privileged vti domain */ vmx_build_io_physmap_table(d); - d->arch.vmx_platform.shared_page_va = - (unsigned long)__va(__gpa_to_mpa(d, IO_PAGE_START)); + mpa = __gpa_to_mpa(d, IO_PAGE_START); + if (mpa == 0) + return -EINVAL; + d->arch.vmx_platform.shared_page_va = (unsigned long)__va(mpa); /* For buffered IO requests. */ spin_lock_init(&d->arch.hvm_domain.buffered_io_lock); - d->arch.hvm_domain.buffered_io_va = - (unsigned long)__va(__gpa_to_mpa(d, BUFFER_IO_PAGE_START)); - d->arch.hvm_domain.buffered_pio_va = - (unsigned long)__va(__gpa_to_mpa(d, BUFFER_PIO_PAGE_START)); + + mpa = __gpa_to_mpa(d, BUFFER_IO_PAGE_START); + if (mpa == 0) + return -EINVAL; + d->arch.hvm_domain.buffered_io_va = (unsigned long)__va(mpa); + mpa = __gpa_to_mpa(d, BUFFER_PIO_PAGE_START); + if (mpa == 0) + return -EINVAL; + d->arch.hvm_domain.buffered_pio_va = (unsigned long)__va(mpa); /* TEMP */ d->arch.vmx_platform.pib_base = 0xfee00000UL; d->arch.sal_data = xmalloc(struct xen_sal_data); + if (d->arch.sal_data == NULL) + return -ENOMEM; /* Only open one port for I/O and interrupt emulation */ memset(&d->shared_info->evtchn_mask[0], 0xff, @@ -421,6 +431,8 @@ void vmx_setup_platform(struct domain *d) viosapic_init(d); vacpi_init(d); + + return 0; } void vmx_do_launch(struct vcpu *v) diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c index 9cf0576951..1ea2ce3df8 100644 --- a/xen/arch/ia64/xen/dom0_ops.c +++ b/xen/arch/ia64/xen/dom0_ops.c @@ -104,8 +104,8 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) ret = -EINVAL; } else { d->arch.is_vti = 1; - vmx_setup_platform(d); xen_ia64_set_convmem_end(d, ds->maxmem); + ret = vmx_setup_platform(d); } } else { diff --git a/xen/include/asm-ia64/vmx.h b/xen/include/asm-ia64/vmx.h index ed7171ff82..0f03df6306 100644 --- a/xen/include/asm-ia64/vmx.h +++ b/xen/include/asm-ia64/vmx.h @@ -33,7 +33,7 @@ extern void vmx_init_env(void); extern int vmx_final_setup_guest(struct vcpu *v); extern void vmx_save_state(struct vcpu *v); extern void vmx_load_state(struct vcpu *v); -extern void vmx_setup_platform(struct domain *d); +extern int vmx_setup_platform(struct domain *d); extern void vmx_do_launch(struct vcpu *v); extern void vmx_io_assist(struct vcpu *v); extern int ia64_hypercall (struct pt_regs *regs); -- 2.30.2